Fix issue #36