Fix for checkout order overwriting
Versioning