Fix identifier reconstruction