Fixed recursion issue with subdirs. GitHub #429