Another attempt at eliminating hanging issue.