Fix machines controller sorting