double free issue
port updated