Introduced possible memory leak :p