Small change to code structure that fixes #62.