fix issue related to folders