Restored original ordering, it was correct but we weren't catching
the quadrilateral, same problem again.