Fix random order issue