Fixes #1661 - check all doesn't work
Merge pull request #1662 from ATofighi/fix-1661

Fixes #1661 - check all doesn't work