Fixed problem with ObjectID