Form leak fix