bugfixing from previous commit, using ToUpper() in the right place