Memory leak fixed (L. Molnar)