implement Matt's comment on #160