Try to speed up folder change