safety
fixed memleak