fix for CARBON-14858
Merge pull request #59 from sameerak/master

fix for CARBON-14858