minhnguyen - fix checkout