fix bug introduced by cherry pick commit
fix bug introduced by cherry pick commit

gmcvicker/WASP,gmcvicker/WASP,gmcvicker/WASP,bmvdgeijn/WASP,bmvdgeijn/WASP,bmvdgeijn/WASP,gmcvicker/WASP,bmvdgeijn/WASP