Fix identifier reconstruction for 4.01