Fix Scott's deadlock

Not Scott's fault, I mean