Fixed id issues