Fixed critical substructure bug.