Fix to main_new