Override it properly this time