fix nesting of map controller