Restore mask on pop - close #51