adding fix for CARBON-14831
Merge pull request #31 from pulasthi/master

adding fix for CARBON-14831