Another improvment on image updates.