followup to #24