fix issues in flow control binidings