Second change for #197.