Thanks for catching this @jrioux ! 

I've added a solution in https://github.com/mrocklin/sympy/commit/92c10ce5b0ba007f9d746442dd350b5416dc8a5f in https://github.com/sympy/sympy/pull/2341 .  The solution feels a bit like cheating but it seems to work cleanly for numeric cases.