// Fix state problem on Store update