Fix uppercase lower case issue