Fix for images and associations