poential bug fix