state transition callback fixes