Fix small bug with BillId equality