address comments from Mark

fix bug