Memory leak resolved (#1)