FX-42: fix by XD team