Fixing primary_key_index