correction on possible deadlock situations
commit