Fix wrong dest PK returned (follow up)