# Pastebin nAc900ER
diff --git a/src/main/java/gamax92/thistle/devices/ComponentSelector.java b/src/main/java/gamax92/thistle/devices/ComponentSelector.java
index 13dcc2f..d6868cf 100644
--- a/src/main/java/gamax92/thistle/devices/ComponentSelector.java
+++ b/src/main/java/gamax92/thistle/devices/ComponentSelector.java
@@ -146,7 +146,6 @@ public class ComponentSelector extends Device {
                switch (address) {
                case COMPSEL_STATCMD_REG:
                        info = 0;
-                       outputbuf.clear();
                        switch (data) {
                        case 0: // map
                                status = 1;
@@ -212,6 +211,8 @@ public class ComponentSelector extends Device {
                        case 3: // list
                                status = 0;
                                tsfdata = null;
+                               outputbuf.clear();
+
                                if (inputbuf.size() > 0) {
                                        Object[] tsfdataz = TSFHelper.readArray(inputbuf, machine, false);
                                        if (tsfdataz == null || tsfdataz.length != 1 || !(tsfdataz[0] instanceof String || tsfdataz[0] instanceof UUID || tsfdataz[0] instanceof Number)) {