All logic bug fixed, but in the wrong order