Uppercase problem fixed