map & controller fixed