Fix for modifier masking