To prevent recurrences of #66