Do not send all switch elements, fix #2