Try a better fix for autoload