Fix for subtrees in submodules