Fixed upperCase issue