Fix up to make ObjectID work again