Fix upper case problem