Fix for issue #698
Fix for issue #698