Fix map clustering