Bugfix for non-hybrid mask mode.