Fixed SnitchMap