Refactor fix_rev
Merge pull request #2053 from suzukaze/refactor-fix_rev

Refactor fix_rev