fix RF-13169

Fixed, but did not tested, its for Lukas ;)