fixed upper, lower case issue