progress towards global masking issue #16