Unlikely memory leak - fixes #2256