fixing random choices