Issue originally pointed out in #55 by @clbarnes.
Issue originally pointed out in #55 by @clbarnes.