The fix for #991 broke "image"; this patch fixes that.
Merge pull request #1098 from jmaas/release24

The fix for #991 broke "image"; this patch fixes that.