fixed ObjectId problems