Bug with Xor fixed