Minor cleanup
Avoid chain corruption after rechaining