memory leak not really fix...