fix - state refs