Fix for issue 773
Fix for issue 773