workaround issue #237