Fix fix for issue #66

...