Fix for Spree 2.2