Fix bug #9
closes #9