fix lock-up issue.