fix identity ordering