Fixing how we do images