Fix autogen order