Fix random selection bug (for reals this time)