Map now passes correct intent