Toxic Fix
Merge pull request #1015 from Fuzzysqurl/toxicfix

Toxic Fix