Fix hang