Autoloader: fix previous commit, add counter