support multiple folders correctly.