Bug fix for #127 when add checkout