Fixed last issues with ObjectId