This will hopefully fix the id problem for now
Next try