fixed uppercase/lowercase problem