Fix autoloading issue