Was missing the extra test to see if it should come at the front when doing the client comparison.