I think this check is not necessary anymore?