FORGE-1459: Fixed canMoveToNextStep implementation