Correcting logic once more