Fixed _id issue (temporarily)