Bug fix, do not depend on ave autoload