Correct UPCASE macro