fixed flow issue