Minor update to set active states correctly.