6.4.2 isn't using funext, close #640