Fix random issue