Fix random bug