fixing jd's mess again