Properly Fixed Folder Issue