potentially fixed deadlocks