Changed to take care about character case