Third fix, should finish it