Can you try this patch?

If it fixes the oops, I'll forward upstream ASAP.

	Jeff