Fix splitting flow