A fix, but one that reintroduces issue #17.