Fixed id setting; accidental merge deletion.