some fix of structure