Bug fix; closes #32