Fixed hanging issues.