Quick/Wide Guard fix
Merge pull request #917 from Fuzzysqurl/guard

Quick/Wide Guard fix