quick patch for bug #139