possible bug fix?