fixed issue of flow