fix replay issues
Merge branch 'master' of https://github.com/wangbin579/gryphon