Upper Case bug fix