Fix for issue #76

Closes #76