Make Guard version more selective