Closes sightmachine/shannon#406