Fixed ObjectManager