add workaround for #2841