Followup to 83f691