Fix for issue #68