fixing Jon's shit