bug fix?