Fixed onLoad issue