Fix for Matterhorn vulnerability