Fixing lower/uppercase issue