Mask clipping fix