Fix map drawing