Fix of the bug 1078