Fixed map bug refs #2261