Valery Kholodkov Fix for fdintino#124