Fixing id setting