Fixing CARBON-14688

Signed-off-by: Jayanga Dissanayake <jsdjayanga@yahoo.com>
Merge pull request #37 from jsdjayanga/CARBON-14688

Fixing CARBON-14688