added autoload for last bug fix