Actually, this one can probably be removed, but we still want a check for the second one