Fix for spree 2.1 compatibility