Concerning #693: Tentative fix, please conform