[XNIO-187] Better fix