Fix mask bug, version 1.2