fix flow a bit