Yes, you cannot assume lights designed to fit 2 x 123a cells will accomidate an 18650 as they are slightly larger diameter. For these lights you can typically use 17670 cells, although at the cost of capacity.

-john