Fix for NB#88031: