Unfudge: this seems stable now, even under load