Optimization of the bug #418620 fix, by Juraj Skripsky <juraj@hotfeet.ch>, thanks!