Made auto load work