Mask bugfix for default mask. See #834