Feels like this should be covered by the component automatically