fix up first flow a bit