workaround for #25954