Expedition bug fix