First attempt to fix the image issue