replaced isTRUE checks