Fix for issue #129

Closes #129