workaround for #40646