Fix wand issue