Wand: Issue #23 fixed?