issue #237