Minor tweak to stored map