Fixing maps implementation