Fixed id overwrite