Add backwards compatible fix for issue 6566