Fixed annotation autoloading