eliminated possible memory leak