Fixed onload issue