Fix loading order for system template