Fixed the type flows