Ongoing fix for approved order