Defiant/Competitive fix + futureproof
Merge pull request #963 from Fuzzysqurl/defiant

Defiant/Competitive fix + futureproof