fixed get current state