Readded critical hanging fix - it is right after all.