Adapt MASK mode to previous changes