onLoad fix