This fix is wrong. please look at the patches already in the tree and fix accordingly.