tentative bug fix