fixing random selection..