fix for CARBON-14486
Merge pull request #15 from shafreenAnfar/master

Fix for CARBON-14486