IDEA-118211 - also avoid double dispose