Fixed empty primary keys