Fix random operator picking