Fix baggage bug