Fix sandbox switch, enable/disable