Fix it properly this time