fix for issue #237