set a timeout to hopefull fix the issue with onload
fixed merge conflict