1.35 primary key fix