Fix issue #31