Bugfix: Change Location info