current state fixes