Fixes #72 - actually a simple fix and a couple lines of code