another patch for bug 969612 and 969624