Fixed onloadListener