Fix flow yet again