possible bug fix