Plug for a a memory leak from Scott McKellar