bug fix 1
oops, better fix