workaround for #24473