Added fix for empty folders