Fix ContentFolder