revert commit af28d3d
Fix for issue #66