Still fixing fs bug