do we still need the `null` check?