Fix upper case bug