Regression from 46e16406. Extended test 1560 to verify. Reported-by: tpaukrt on github Fixes #3218 Closes #3219