fixed uppercase issue