Should we add the class and ARIA checks for this case as well?