Fix for issue 707