workaround for issue #1