Fixed manage bug