Fixed version incrementing twice when both structure and state are modified