Incorporated (possibly wrongly) in issue #16