Fix PrimaryKey