RemoveStageBarrier: fix previously found problem