incorporate spree bug fix #981