Fix destructor release/cleanup loop