Fixed my code, again