doh, fix missing refactor of mapWithSetup