Fixing infinte loop of flow