extend bug620