Logic - last mistake repaired