fixing flow a bit