Fixed random issues.