Improve masking of words