Autoload issue, fixes #1