Made more reliable, autoload work