remove possible deadlock situation