fixed clashes with autogenerated IDs