Issue #638 - Fix mask number