Fixed application hang