Fixed bug with folder