Fixed Uppercase problem