Added compatibility with one step checkout