Bug fixing in filesystem