fix match case problems