Fix for tunnel experiment