JPR Merge Fix