Further implementations on issue #62.