Fixed random bug