Fix definitely silent hang.
Merge pull request #4035 from HassenRiahi/FixSilentHang

Fix definitely silent hang.