Testable change for freezing issue