fixed a crashbug during tiff check
Merge branch 'master' into faster