[BUGFIX] use ObjectManager instead of makeInstance