autoload bug fix 1 by clainatomi