Try to fix folder does not exist issue

## Not ready to be merged yet

Address #1