converted sep 3 for #629