Fixer base

Just love to remove duplicated code
Good point. Thx.