Fix ObjectId issue