I think I broke this during a "cleanup" Closes #18