Make it compatible with newer Spree