Logic Fix