fixed fs to use self