fixed possible memory leak
fixed possible memory leak
Merge branch 'maskbug'