Finaly fix transition without hackfix (FSM1)