Merge pull request #78 from MaxFangX/fix-chanman-race-panic