Adding compatibility for "on" value