Even with new gas gren code on client side, my guess is there is some desync somewhere or not accounting for the swap somewhere.