gh-180 : fixes issue with multiple disposals