Fixed the id issue, finally