Bug fix: able to dive into sub-directories