fix(hooks): master bugs