Fix issue #71