fix weird structure