Fixed the upper case problem