One more fix for J25 and heading