Fix mask problem