Possible remediation of issue 9

Closes #9