Another fix for Admin Wand tool.