Fixer base

Just love to remove duplicated code
nevermind, changed!

This fixer is removed in PR #472 so no big deal