Make load-on-startup work