Fixed regression from onload/onloaded fix