Potential improvements for deadlocking