Fix map problem