Fixed issue in autoloader