Merge pull request #459 from CrazyHZM/fix/reactor