Fix loading from folders