Bug Fix for wand