fix faulty cleanup on F| and H|