Oops. Fix logic failures.