Still buggy when walking directory tree