Fix map to call setup