Fixed uppercase/lowercase issue