Fixing general folders complete