fixed uppercase problem