Potential fix for article 7309