followup to 90b109a6