Fix the common section related