UNI-Flex fix