Fix nasty versions. See #60