Fixing objectManager