Polish work to #issue #39 thumbs