Fix bug with missing folder and close issue #1