ticket:89 put map back in place