Leak-free version

Leak-free version
1 to 2 (from a total of 2)