Fixing Stat Switch