Modified order of compiles to fix bug