State transition fix