Hot fix by XPOS team