Fixed last piece of #673.