Fix for directory-removing when empty