Flatten fix