Fixed identifier saving (again).