Fixing CARBON-14739 by Jasintha
Merge pull request #2 from manoj-kumara/master

Fixing CARBON-14739 by Jasintha