* Partially fixes NB#85031. At least it fixes comment #1