Fix for spree 2.3.x