[XNIO-226] Better fix