Fix for locations doubling up bug