started work on patch for bug 865288. still need to write a test