Fixing custom field implementation for images (and possibly others).