Bug fix (C.Cheshkov)