Here is a patch that fixes a serious endless loop problem on 32 bit