bug fix 2nd try