Stav dette: Fixing the spy machine