[feature]Multiple use fixer.

Multiple use fixer.
As requested: #140
The PR was updated after I reviewed it actually (pushing new commits in a PR does not trigger a notification telling us to look at changes).
So it is indeed a good place for it if the logic is common.

Which PR should be merged first ? this one or #471 ?