Second go at fixing images