FIX: regression on issue #370 fixed.
FIX: regression on issue #370 fixed.

red-eco/red,rheber/red,vehar/red,NikolayShubenkovProgSchool/red,vehar/red,NikolayShubenkovProgSchool/red,iArnold/red,iArnold/red,red-eco/red,rheber/red