Workaround some more strange wand issues.

Why is this such a challenge... ?