Bugfix location -> save mac