Added a check in the autoload to make sure we don't break stuff
Version 1.21.1