I like this version of the fix to PreviewMegaTree a bit better.