removed deadlocking