Fix for images: using image if defined in priority to amazon image