another fix for folder mode