Upgraded to spree 2.1.x