Fixed bug #7: IDs not unique