Fixed #f problem