7.0 fix 595 afe

Fix issue #595 by explicitely testing the case causing the error.