bug fix for new mask-mode formats