hack-fixed memory leak