fixing CARBON-14565
Merge pull request #1 from chanikag/master

fixing CARBON-14565