Added extra map to fix bug