More on #630