Fix for autoloader (#49363 in forge)