#1833 - Ponnu/Shiva - Fixed the defect