Hopefully fix deadlock introduced in a0a050ce