Uppercase issue fix