Fix it properly