Tentative bug fix