Issue fix

Closes #9