Fix with JF hints