changed to work with is_null.