Fix for next aired support