fixed flow bug, done?