potential bug fix