Make update more robust.