Fix issue #25 image problems