merging bug fix for busted trailing root() optimization