workaround for issue #22