Use better equality in fact (infinite loop else)