fix one-step/shortcut checkout