followup to #122