Bugfix id numbers