Fix issue #60