CHM2 with potential fix for livelock issue