Fix common structure