Fix issue #70