Fix to object manager