Fixed upcase issue