Followup to e993608