Improve IP masking