active state fixes