Fix for issue-1759