Testing Joshua's fixes