Fix issue #37