Really closes #32
Really closes #32 this time