Bug fix; closes #18