fixed wrong grouping of sub structures