Change location fix behaviour