Fixing CARBON-14930

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

Fixing CARBON-14930