diff --git a/scripts/regression_tests/encapsulate.pd b/scripts/regression_tests/encapsulate.pd
new file mode 100644
index 0000000000000000000000000000000000000000..7e3fe921e3879876ec60b6e76d3422ce258d77bf
--- /dev/null
+++ b/scripts/regression_tests/encapsulate.pd
@@ -0,0 +1,126 @@
+#N canvas 472 0 948 963 10;
+#X obj 794 292 s pd-encapsulate_test.pd;
+#X obj 55 22 inlet;
+#X obj 65 674 outlet;
+#X obj 174 61 t b b;
+#X obj 101 318 float;
+#X obj 101 273 until;
+#X obj 193 318 bang;
+#X msg 101 238 bang;
+#X obj 86 90 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X msg 794 96 editmode 1;
+#X msg 794 180 encapsulate;
+#X obj 651 42 t b b b b b b b b b;
+#X msg 169 271 0;
+#X msg 794 208 obj_addtobuf pd test;
+#X msg 794 236 obj_buftotext;
+#X msg 794 264 noselect;
+#X obj 102 404 list cat;
+#X obj 102 361 moses 5;
+#X obj 103 489 unpack f f f f f;
+#X obj 103 447 spigot;
+#X obj 410 236 float 1;
+#X obj 298 567 ==;
+#X obj 331 567 ==;
+#X obj 367 567 ==;
+#X obj 401 567 ==;
+#X obj 437 567 ==;
+#X obj 491 251 float 0;
+#X msg 512 209 clear;
+#X obj 371 168 t b b b;
+#X obj 474 168 t b b b;
+#X obj 404 611 &&;
+#X obj 452 611 + 0;
+#X obj 386 645 float;
+#X obj 606 312 float;
+#X obj 606 267 until;
+#X obj 698 312 bang;
+#X msg 606 232 bang;
+#X msg 674 265 0;
+#X obj 607 398 list cat;
+#X obj 607 355 moses 5;
+#X obj 608 483 unpack f f f f f;
+#X obj 608 441 spigot;
+#X obj 653 312 + 1;
+#X msg 794 124 mouse 100 280 1 0;
+#X msg 794 152 mouseup 250 380 0;
+#X obj 148 318 + 1;
+#X obj 65 621 list append encapsulate feature error;
+#X connect 1 0 3 0;
+#X connect 3 1 11 0;
+#X connect 4 0 17 0;
+#X connect 4 0 45 0;
+#X connect 5 0 4 0;
+#X connect 6 0 5 1;
+#X connect 7 0 5 0;
+#X connect 8 0 3 0;
+#X connect 9 0 0 0;
+#X connect 10 0 0 0;
+#X connect 11 0 28 0;
+#X connect 11 1 29 0;
+#X connect 11 2 15 0;
+#X connect 11 3 14 0;
+#X connect 11 4 13 0;
+#X connect 11 5 10 0;
+#X connect 11 6 44 0;
+#X connect 11 7 43 0;
+#X connect 11 8 9 0;
+#X connect 12 0 4 1;
+#X connect 13 0 0 0;
+#X connect 14 0 0 0;
+#X connect 15 0 0 0;
+#X connect 16 0 19 0;
+#X connect 17 0 16 0;
+#X connect 17 1 6 0;
+#X connect 18 0 21 0;
+#X connect 18 1 22 0;
+#X connect 18 2 23 0;
+#X connect 18 3 24 0;
+#X connect 18 4 25 0;
+#X connect 19 0 18 0;
+#X connect 20 0 30 1;
+#X connect 20 0 41 1;
+#X connect 20 0 19 1;
+#X connect 21 0 30 0;
+#X connect 22 0 30 0;
+#X connect 23 0 30 0;
+#X connect 24 0 30 0;
+#X connect 25 0 30 0;
+#X connect 26 0 41 1;
+#X connect 26 0 19 1;
+#X connect 27 0 38 1;
+#X connect 27 0 16 1;
+#X connect 28 0 32 0;
+#X connect 28 1 38 0;
+#X connect 28 1 16 0;
+#X connect 28 2 20 0;
+#X connect 29 0 36 0;
+#X connect 29 0 7 0;
+#X connect 29 1 26 0;
+#X connect 29 2 27 0;
+#X connect 29 2 12 0;
+#X connect 30 0 31 0;
+#X connect 30 0 32 0;
+#X connect 31 0 30 1;
+#X connect 32 0 46 0;
+#X connect 33 0 39 0;
+#X connect 33 0 42 0;
+#X connect 34 0 33 0;
+#X connect 35 0 34 1;
+#X connect 36 0 34 0;
+#X connect 37 0 33 1;
+#X connect 38 0 41 0;
+#X connect 39 0 38 0;
+#X connect 39 1 35 0;
+#X connect 40 0 21 1;
+#X connect 40 1 22 1;
+#X connect 40 2 23 1;
+#X connect 40 3 24 1;
+#X connect 40 4 25 1;
+#X connect 41 0 40 0;
+#X connect 42 0 33 1;
+#X connect 43 0 0 0;
+#X connect 44 0 0 0;
+#X connect 45 0 4 1;
+#X connect 46 0 2 0;