Quick fix: Demo toggling works better with nil