Bug fix for warroom