Fix bug restoring name/location