Question: do we still need this check?