Some fixes about pathSelection