Fixed flow form bug