Fixing issue with pre-populated directories