follow-up to a57aee35dc4978b870e8e334843ebb033e5248d6