Fixes bug with rave switch