flow fix #2