Primary Key Bug Fix