Fix up structure