Fixing guard to run during refactors