Bug fix and image sample