hmmmm...more bug fix