fix OnLoad