Fix of a bug #2199