Fix NOR bug