Fix autoloader issue

Fix autoloader issue