Fixing UPPER/LOWER case issue