Fix for issue 8397