Add work around for solo os_walk