Fix uppercase problem