finally make source folding work right