Fixing "Add GW" Room