Fix main (again)