Signal sorter fix