Fix issue #68