Fixed small active-state issue