fix common state