Fixing CARBON-14690

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

Fixing CARBON-14690