Fixed id errors