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