fixed fs issues