Fixed 6.x issue

also added metric/imperial remember fix