fixed current_cart