Bugfix
id generation