Change image and fix a bug