Fix for Spree 2.0