Fixes #326. Stops subtree aliasing at block boundary.
Merge pull request #328 from herby/gh-326

Fixes #326. Stops subtree aliasing at block boundary.