fix upper-case/lowercase problems