Fixed Stupid Logic