Fix spree issue