Fixed name reset after location change issue #126