This patch is OK for the current development sources, though I agree with you that we need a better solution. We should either generalize the code or rip it out. Jim