Trying to fix SW3 Bug