memory leak fix try #1