Line 72-77 fixed