Another fix for autorequire