Fix problem with initial image load