fun override fixes