implements #83 as comment