Still fixing image, issue #23