LPS-40330 Fix uneven distribution issue