Fixing CARBON-15051

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

Fixing CARBON-15051