Autloader fix attempt