Fix warning
Fix memory leak
v7.0.2