#84 modify mask method