made patches for bugs 989025 and 989043