Fixing hiding state bug when mixing in