Issue #38 dupplication of the map