ok fixed hanging bug