Fixed XXXX handling