Bug fix; closes #16