adding back in the defined check.