WK-760 fixed autoloader issue