3.4.4 Fix unresponsiveness