Attempt to address the deadlocking