More on #611