bug fix (hopefully the last)