workaround for issue #84