Fix for issue-589