Improved check
Merge branch 'bug/fixRemoveNonEmptyDir' into experimental