Fixed uppercase issue