Fix for spree 2-2 and Money > 6.1.x