FIX: additional fix for issue #484.
FIX: additional fix for issue #484.

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