flow fix #3