Bug fix; closes #11