Fix it to actually work