Fix to the if/unless XML logic