Fixed duplicate when condition, preventing register var shadowing