Fixer base

Just love to remove duplicated code
If we agreed we can BC with 1.0 release then yes, change it is good move.