better handling for "off"