changed autoloading to avoid bug in 2.4