Second fix for issue 701