fix omitted mask handling