Fix JID reporting