Fixes #1661 - check all doesn't work

#1661