Concerning #787: Tentative fix