Fixing my Way of the Warrior again