Fixes duplicated id (Feature #86)