Added second variable sorter fix