possible L2S collision improvement, need further testing