Fixed issue stemming from autoload recursion