Fixed an issue causing the whole system to deadlock.