Success on 2.2.2, now to make it work with both :\
Ok. Tests pass on 1.9.3, 2.0.0 and 2.1.1.