Location watch fix