Fixed my solution