Fix End of Class