Fix for issue 6864