Weapon Swapping eliminates Grim Feast ES overcap

Same issue, hoping its a bug. Seemed to come up after the patch but not immediately after. I totally get preventing "free shield" by grim feasting on low ES base and then swapping to high ES to maintain the %, but removing shield for swapping back and forth doesn't make sense either, especially for minion builds who are forced to swap a lot to mitigate bad minion-door AI. Please fix GGG!