Fix for #1

Closes #1