Fixed fs bug