Fix for NB#87160