Trying to fix: http://ctrev.cyber-tm.ru/tracker/issue-126.html