Fixing maps structure.