FX-43: Fix by XD team