Fixed the flex issue