Fixed #5, #6 - Bug when multiple cart items