Change handle to support both true and false