Fix structure
Fix