fix freezing problem
merge