converted sep 7 for #629