Promised patch - also resolves a leak.

cheers,
jamal