Another attempt to fix flow redirect