extend bug fix