Merge pull request #1784 from vivekarora/HR-176-Corrected