add workaround for #2090