Second try at fixing #99 - spec from pull request now passes.