fix: some bugs