minor fix for mask reuse
Merge branch 'mask'