fix crash when restoring nested passthroughs, update test