Follow up filed in #154.