Mask mode, resume bug fix. Closes #780.