fixed currentFolder