Without including the masterlist fix