fix mapping of order