Trying to fix the weird location format