tag 34077 patch

Here's a simpler patch set to fix this: