Additional fix for issue 9565